Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 8 Jan 2010 14:59:17 +0000 (14:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 8 Jan 2010 14:59:17 +0000 (14:59 +0000)
commit9aaa5bc62a717b6f29b90bff59b06ab3848e0d74
treed3d4ed107306dbf96697a615359d782c1b9638dc
parent438d470ff7897fc60748be82fe06bffe12eb617f
parent97253d0bd7c1269b2db1eb77d53674a5d204c807
Merge from mainline.